constify source argument of babl_process

diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c
index 446979da3fa696883a1e0cdd7755bd862997a8c4..0740d178d725b113df0f74be10d1362ac235cdb5 100644 (file)
--- a/babl/babl-conversion.c
+++ b/babl/babl-conversion.c
@@ -284,7 +284,7 @@ babl_conversion_new (void *first_arg,
 
 static long
 babl_conversion_linear_process (BablConversion *conversion,
-                                void           *source,
+                                const void     *source,
                                 void           *destination,
                                 long            n)
 {
@@ -293,7 +293,7 @@ babl_conversion_linear_process (BablConversion *conversion,
 
 static long
 babl_conversion_plane_process (BablConversion *conversion,
-                               void           *source,
+                               const void     *source,
                                void           *destination,
                                int             src_pitch,
                                int             dst_pitch,
@@ -311,10 +311,10 @@ babl_conversion_planar_process (BablConversion *conversion,
                                 long            n)
 {
 #ifdef USE_ALLOCA
-  char **src_data = alloca (sizeof (void *) * source->components);
+  const char **src_data = alloca (sizeof (void *) * source->components);
   char **dst_data = alloca (sizeof (void *) * destination->components);
 #else
-  char  *src_data[BABL_MAX_COMPONENTS];
+  const char  *src_data[BABL_MAX_COMPONENTS];
   char  *dst_data[BABL_MAX_COMPONENTS];
 #endif
 
@@ -331,10 +331,10 @@ babl_conversion_planar_process (BablConversion *conversion,
 }
 
 long
-babl_conversion_process (Babl *babl,
-                         char *source,
-                         char *destination,
-                         long  n)
+babl_conversion_process (Babl       *babl,
+                         const char *source,
+                         char       *destination,
+                         long        n)
 {
   BablConversion *conversion = (BablConversion *) babl;
 
@@ -344,7 +344,7 @@ babl_conversion_process (Babl *babl,
     {
       case BABL_CONVERSION_PLANE:
       {
-        void *src_data  = NULL;
+        const void *src_data  = NULL;
         void *dst_data  = NULL;
         int   src_pitch = 0;
         int   dst_pitch = 0;

diff --git a/babl/babl-conversion.h b/babl/babl-conversion.h
index fbbb2798ced9e5fbbb8965ade30c25031bfe40ce..7b6cd4dbce908fa156560db3f1096a950852782d 100644 (file)
--- a/babl/babl-conversion.h
+++ b/babl/babl-conversion.h
@@ -28,11 +28,11 @@ Babl * babl_conversion (const char *name);
 /* Signature of functions registered for reference type
  * conversions,
  */
-typedef long (*BablFuncPlane)     (char  *src,
-                                   char  *dst,
-                                   int    src_pitch,
-                                   int    dst_pitch,
-                                   long   n);
+typedef long (*BablFuncPlane)     (const char  *src,
+                                   char        *dst,
+                                   int          src_pitch,
+                                   int          dst_pitch,
+                                   long         n);
 
 
 typedef struct

diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c
index da5e0b0eac78471ae2c6fcbc18b13e8ced3a4700..53cb6585971a8817c2a28d06b436177d43db82af 100644 (file)
--- a/babl/babl-fish-path.c
+++ b/babl/babl-fish-path.c
@@ -64,10 +64,10 @@ get_path_instrumentation (FishPathInstrumentation *fpi,
                           double                  *path_error);
 
 static long
-process_conversion_path (BablList *path,
-                         void     *source_buffer,
-                         void     *destination_buffer,
-                         long     n);
+process_conversion_path (BablList   *path,
+                         const void *source_buffer,
+                         void       *destination_buffer,
+                         long        n);
 
 static void
 get_conversion_path (PathContext *pc,
@@ -312,24 +312,23 @@ babl_fish_path (const Babl *source,
 }
 
 static long
-babl_fish_path_process (Babl *babl,
-                        void *source,
-                        void *destination,
-                        long  n)
+babl_fish_path_process (Babl       *babl,
+                        const void *source,
+                        void       *destination,
+                        long        n)
 {
   return process_conversion_path (babl->fish_path.conversion_list,
-                                 source,
-                                 destination,
-                                 n);
+                                  source,
+                                  destination,
+                                  n);
 
 }
 
-
 static long
-babl_fish_process (Babl *babl,
-                   void *source,
-                   void *destination,
-                   long  n)
+babl_fish_process (Babl       *babl,
+                   const void *source,
+                   void       *destination,
+                   long        n)
 {
   long ret = 0;
 
@@ -373,10 +372,10 @@ babl_fish_process (Babl *babl,
 }
 
 long
-babl_process (Babl *babl,
-              void *source,
-              void *destination,
-              long  n)
+babl_process (Babl       *babl,
+              const void *source,
+              void       *destination,
+              long        n)
 {
   babl_assert (babl);
   babl_assert (source);
@@ -405,10 +404,10 @@ babl_process (Babl *babl,
 }
 
 static long
-process_conversion_path (BablList *path,
-                         void     *source_buffer,
-                         void     *destination_buffer,
-                         long     n)
+process_conversion_path (BablList   *path,
+                         const void *source_buffer,
+                         void       *destination_buffer,
+                         long        n)
 {
   int conversions = babl_list_size (path);
 

diff --git a/babl/babl-fish-reference.c b/babl/babl-fish-reference.c
index fa47ea920cf6cf1c5705c74507068b5d13c9300a..4f90d129e8fd65ef9c712e2966cbf6825d517834 100644 (file)
--- a/babl/babl-fish-reference.c
+++ b/babl/babl-fish-reference.c
@@ -92,11 +92,11 @@ babl_fish_reference (const Babl *source,
 
 
 static void
-convert_to_double (BablFormat *source_fmt,
-                   BablImage  *source,
-                   char       *source_buf,
-                   char       *source_double_buf,
-                   int         n)
+convert_to_double (BablFormat      *source_fmt,
+                   const BablImage *source,
+                   char            *source_buf,
+                   char            *source_double_buf,
+                   int              n)
 {
   int        i;
 
@@ -203,11 +203,11 @@ convert_from_double (BablFormat *destination_fmt,
 
 
 static void
-ncomponent_convert_to_double (BablFormat *source_fmt,
-                              BablImage  *source,
-                              char       *source_buf,
-                              char       *source_double_buf,
-                              int         n)
+ncomponent_convert_to_double (BablFormat       *source_fmt,
+                              const BablImage  *source,
+                              char             *source_buf,
+                              char             *source_double_buf,
+                              int               n)
 {
   BablImage *src_img;
   BablImage *dst_img;
@@ -276,10 +276,10 @@ ncomponent_convert_from_double (BablFormat *destination_fmt,
 
 
 static int
-process_same_model (Babl      *babl,
-                    BablImage *source,
-                    BablImage *destination,
-                    long       n)
+process_same_model (Babl            *babl,
+                    const BablImage *source,
+                    BablImage       *destination,
+                    long             n)
 {
   void *double_buf;
 
@@ -341,10 +341,10 @@ process_same_model (Babl      *babl,
 }
 
 long
-babl_fish_reference_process (Babl      *babl,
-                             BablImage *source,
-                             BablImage *destination,
-                             long       n)
+babl_fish_reference_process (Babl            *babl,
+                             const BablImage *source,
+                             BablImage       *destination,
+                             long             n)
 {
   void *source_double_buf;
   void *rgba_double_buf;

diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index fbc45c369e022cb1727df77920ea6a8fa7007bc2..02723a5e2e38b50df43540bfbd2ea9fc87fe9138 100644 (file)
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -70,7 +70,7 @@ Babl *   babl_conversion_find           (const void     *source,
 double   babl_conversion_error          (BablConversion *conversion);
 long     babl_conversion_cost           (BablConversion *conversion);
 long     babl_conversion_process        (Babl           *conversion,
-                                         char           *source,
+                                         const char     *source,
                                          char           *destination,
                                          long            n);
 
@@ -83,7 +83,7 @@ Babl   * babl_extension_quiet_log       (void);
 void     babl_extension_deinit          (void);
 
 long     babl_fish_reference_process    (Babl           *babl,
-                                         BablImage      *source,
+                                         const BablImage*source,
                                          BablImage      *destination,
                                          long            n);
 

diff --git a/babl/babl-types.h b/babl/babl-types.h
index 162e6c9a25185dedd55bd38efc6ae9897a3edaa3..7871e3b78d26536dd729de905547df91d7c6e2d8 100644 (file)
--- a/babl/babl-types.h
+++ b/babl/babl-types.h
@@ -33,13 +33,13 @@ typedef union _Babl Babl;
 /* Conversion function between linear data of a either a data types or
  * color formats.
  */
-typedef long (*BablFuncLinear)    (char  *src,
+typedef long (*BablFuncLinear)    (const char  *src,
                                    char  *dst,
                                    long   n);
 
 /* TypePlanar,ModelPlanar and FormatPlanar */
 typedef long (*BablFuncPlanar)    (int    src_bands,
-                                   char  *src[],
+                                   const char  *src[],
                                    int    src_pitch[],
                                    int    dst_bands,
                                    char  *dst[],

diff --git a/babl/babl.h b/babl/babl.h
index 2c248a5b3e20f43e97451a93ef2c843e838c1b79..49110d37a9af7904cc1df356b4b6263851a24b53 100644 (file)
--- a/babl/babl.h
+++ b/babl/babl.h
@@ -84,7 +84,7 @@ Babl *       babl_fish      (const void *source_format,
  *  returns number of pixels converted.
  */
 long         babl_process   (Babl *babl_fish,
-                             void *source,
+                             const void *source,
                              void *destination,
                              long  n);